From 2e6fb52be209de406a61702aaf5f24e0bd2e1e34 Mon Sep 17 00:00:00 2001 From: robertlipe Date: Mon, 15 Jul 2013 02:05:25 +0000 Subject: [PATCH] Gerhard's MSVC battle continues. --- gpsbabel/Makefile.in | 7 +- gpsbabel/mingw/mkwintesto.c | 1 + gpsbabel/msvc/Debug.empty | 0 gpsbabel/msvc/GPSBabel.dsp | 720 ------ gpsbabel/msvc/GPSBabel.dsw | 29 - gpsbabel/msvc/GPSBabel.vcxproj | 3892 +++--------------------------- gpsbabel/msvc/Unicode.empty | 0 gpsbabel/msvc/build.bat | 8 - gpsbabel/msvc/mkwintesto.sln | 20 + gpsbabel/msvc/mkwintesto.vcxproj | 122 + gpsbabel/msvc/release.empty | 0 11 files changed, 525 insertions(+), 4274 deletions(-) delete mode 100644 gpsbabel/msvc/Debug.empty delete mode 100644 gpsbabel/msvc/GPSBabel.dsp delete mode 100644 gpsbabel/msvc/GPSBabel.dsw delete mode 100644 gpsbabel/msvc/Unicode.empty delete mode 100644 gpsbabel/msvc/build.bat create mode 100644 gpsbabel/msvc/mkwintesto.sln create mode 100644 gpsbabel/msvc/mkwintesto.vcxproj delete mode 100644 gpsbabel/msvc/release.empty diff --git a/gpsbabel/Makefile.in b/gpsbabel/Makefile.in index d54d322b0..b7c2143a0 100644 --- a/gpsbabel/Makefile.in +++ b/gpsbabel/Makefile.in @@ -36,7 +36,7 @@ RC=@RC@ # but cc/gcc does: # $(OUTPUT_SWITCH)main.o # becomes -o main.o (gcc) -# or -Fomain.o (cl.exe) +# or -Fomain.o (cl.exe) (currently unused) OUTPUT_SWITCH=-o # QT_INC=@QT_INC@ @@ -409,9 +409,8 @@ mac-gui-dmg: mac-gui mv gui/objects/GPSBabelFE.dmg gui/objects/GPSBabel-$(VERSIOND).dmg msvc-build: - make CXX=@CL.EXE DEBUGGING="" EXTRA_CFLAGS="-nologo -W3 -WL -D__WIN32__ -I msvc/expat " OUTPUT_SWITCH="-Fo" $(OBJS) - echo $(OBJS) > objs.lst - LINK.EXE /NOLOGO @objs.lst ./msvc/expat/libexpat.lib /out:gpsbabel.exe + @#Intended for development. Assume .NET 4 is used - may require tweaks + "$(word 1, $(wildcard $(SYSTEMROOT)/Microsoft.NET/Framework/v4*/msbuild.exe))" msvc/GPSBabel.vcxproj /nologo /maxcpucount # release check using CVS tree test-release: doc gpsbabel.html changes.html diff --git a/gpsbabel/mingw/mkwintesto.c b/gpsbabel/mingw/mkwintesto.c index cd87679db..78d2535f1 100644 --- a/gpsbabel/mingw/mkwintesto.c +++ b/gpsbabel/mingw/mkwintesto.c @@ -30,6 +30,7 @@ #include #include #include +#include #define LINELENGTH 256 #define MYNAME "MkWinTesto" diff --git a/gpsbabel/msvc/Debug.empty b/gpsbabel/msvc/Debug.empty deleted file mode 100644 index e69de29bb..000000000 diff --git a/gpsbabel/msvc/GPSBabel.dsp b/gpsbabel/msvc/GPSBabel.dsp deleted file mode 100644 index 225d705a8..000000000 --- a/gpsbabel/msvc/GPSBabel.dsp +++ /dev/null @@ -1,720 +0,0 @@ -# Microsoft Developer Studio Project File - Name="GPSBabel" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "Win32 (x86) Console Application" 0x0103 - -CFG=GPSBabel - Win32 Debug -!MESSAGE This is not a valid makefile. To build this project using NMAKE, -!MESSAGE use the Export Makefile command and run -!MESSAGE -!MESSAGE NMAKE /f "GPSBabel.mak". -!MESSAGE -!MESSAGE You can specify a configuration when running NMAKE -!MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE -!MESSAGE NMAKE /f "GPSBabel.mak" CFG="GPSBabel - Win32 Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "GPSBabel - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "GPSBabel - Win32 Debug" (based on "Win32 (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "GPSBabel - Win32 Release" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "Release" -# PROP BASE Intermediate_Dir "Release" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 0 -# PROP Output_Dir "Release" -# PROP Intermediate_Dir "Release" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /W3 /WX /GX /O2 /I "expat" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "__WIN32__" /D VERSION=\"1.2.6_beta06232005_msvc\" /YX /FD /c -# ADD BASE RSC /l 0x409 /d "NDEBUG" -# ADD RSC /l 0x409 /d "NDEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib setupapi.lib /nologo /subsystem:console /machine:I386 - -!ELSEIF "$(CFG)" == "GPSBabel - Win32 Debug" - -# PROP BASE Use_MFC 0 -# PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "Debug" -# PROP BASE Intermediate_Dir "Debug" -# PROP BASE Target_Dir "" -# PROP Use_MFC 0 -# PROP Use_Debug_Libraries 1 -# PROP Output_Dir "Debug" -# PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 -# PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /W3 /WX /Gm /GX /ZI /Od /I "expat" /D "WIN32" /D "__WIN32__" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D VERSION=\"1.2.6_beta06232005_msvc\" /FR /YX /FD /GZ /c -# ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" -BSC32=bscmake.exe -# ADD BASE BSC32 /nologo -# ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib setupapi.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "GPSBabel - Win32 Release" -# Name "GPSBabel - Win32 Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Group "Jeeps" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\jeeps\gpsapp.c - -!IF "$(CFG)" == "GPSBabel - Win32 Release" - -# PROP Intermediate_Dir "Release\Jeeps" - -!ELSEIF "$(CFG)" == "GPSBabel - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Jeeps" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\jeeps\gpscom.c - -!IF "$(CFG)" == "GPSBabel - Win32 Release" - -# PROP Intermediate_Dir "Release\Jeeps" - -!ELSEIF "$(CFG)" == "GPSBabel - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Jeeps" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\jeeps\gpsmath.c - -!IF "$(CFG)" == "GPSBabel - Win32 Release" - -# PROP Intermediate_Dir "Release\Jeeps" - -!ELSEIF "$(CFG)" == "GPSBabel - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Jeeps" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\jeeps\gpsmem.c - -!IF "$(CFG)" == "GPSBabel - Win32 Release" - -# PROP Intermediate_Dir "Release\Jeeps" - -!ELSEIF "$(CFG)" == "GPSBabel - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Jeeps" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\jeeps\gpsprot.c - -!IF "$(CFG)" == "GPSBabel - Win32 Release" - -# PROP Intermediate_Dir "Release\Jeeps" - -!ELSEIF "$(CFG)" == "GPSBabel - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Jeeps" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\jeeps\gpsread.c - -!IF "$(CFG)" == "GPSBabel - Win32 Release" - -# PROP Intermediate_Dir "Release\Jeeps" - -!ELSEIF "$(CFG)" == "GPSBabel - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Jeeps" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\jeeps\gpsrqst.c - -!IF "$(CFG)" == "GPSBabel - Win32 Release" - -# PROP Intermediate_Dir "Release\Jeeps" - -!ELSEIF "$(CFG)" == "GPSBabel - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Jeeps" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\jeeps\gpssend.c - -!IF "$(CFG)" == "GPSBabel - Win32 Release" - -# PROP Intermediate_Dir "Release\Jeeps" - -!ELSEIF "$(CFG)" == "GPSBabel - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Jeeps" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\jeeps\gpsserial.c - -!IF "$(CFG)" == "GPSBabel - Win32 Release" - -# PROP Intermediate_Dir "Release\Jeeps" - -!ELSEIF "$(CFG)" == "GPSBabel - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Jeeps" - -!ENDIF - -# End Source File -# Begin Source File - -SOURCE=..\jeeps\gpsusbread.c -# End Source File -# Begin Source File - -SOURCE=..\jeeps\gpsusbsend.c -# End Source File -# Begin Source File - -SOURCE=..\jeeps\gpsusbstub.c -# End Source File -# Begin Source File - -SOURCE=..\jeeps\gpsusbwin.c -# End Source File -# Begin Source File - -SOURCE=..\jeeps\gpsutil.c - -!IF "$(CFG)" == "GPSBabel - Win32 Release" - -# PROP Intermediate_Dir "Release\Jeeps" - -!ELSEIF "$(CFG)" == "GPSBabel - Win32 Debug" - -# PROP Intermediate_Dir "Debug\Jeeps" - -!ENDIF - -# End Source File -# End Group -# Begin Group "ShapeLib" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\shapelib\dbfopen.c -# End Source File -# Begin Source File - -SOURCE=..\shapelib\shpopen.c -# End Source File -# End Group -# Begin Source File - -SOURCE=..\an1.c -# End Source File -# Begin Source File - -SOURCE=..\arcdist.c -# End Source File -# Begin Source File - -SOURCE=..\brauniger_iq.c -# End Source File -# Begin Source File - -SOURCE=..\wbt-200.c -# End Source File -# Begin Source File - -SOURCE=..\cetus.c -# End Source File -# Begin Source File - -SOURCE=..\coastexp.c -# End Source File -# Begin Source File - -SOURCE=..\copilot.c -# End Source File -# Begin Source File - -SOURCE=..\csv_util.c -# End Source File -# Begin Source File - -SOURCE=..\delgpl.c -# End Source File -# Begin Source File - -SOURCE=..\duplicate.c -# End Source File -# Begin Source File - -SOURCE=..\easygps.c -# End Source File -# Begin Source File - -SOURCE=..\filter_vecs.c -# End Source File -# Begin Source File - -SOURCE=..\garmin.c -# End Source File -# Begin Source File - -SOURCE=..\garmin_tables.c -# End Source File -# Begin Source File - -SOURCE=..\gcdb.c -# End Source File -# Begin Source File - -SOURCE=..\geo.c -# End Source File -# Begin Source File - -SOURCE=..\geoniche.c -# End Source File -# Begin Source File - -SOURCE=..\glogbook.c -# End Source File -# Begin Source File - -SOURCE=..\google.c -# End Source File -# Begin Source File - -SOURCE=..\gpilots.c -# End Source File -# Begin Source File - -SOURCE=..\gpspilot.c -# End Source File -# Begin Source File - -SOURCE=..\gpsutil.c -# End Source File -# Begin Source File - -SOURCE=..\gpx.c -# End Source File -# Begin Source File - -SOURCE=..\grtcirc.c -# End Source File -# Begin Source File - -SOURCE=..\hiketech.c -# End Source File -# Begin Source File - -SOURCE=..\holux.c -# End Source File -# Begin Source File - -SOURCE=..\hsa_ndv.c -# End Source File -# Begin Source File - -SOURCE=..\html.c -# End Source File -# Begin Source File - -SOURCE=..\igc.c -# End Source File -# Begin Source File - -SOURCE=..\internal_styles.c -# End Source File -# Begin Source File - -SOURCE=..\kml.c -# End Source File -# Begin Source File - -SOURCE=..\lowranceusr.c -# End Source File -# Begin Source File - -SOURCE=..\maggeo.c -# End Source File -# Begin Source File - -SOURCE=..\magnav.c -# End Source File -# Begin Source File - -SOURCE=..\magproto.c -# End Source File -# Begin Source File - -SOURCE=..\main.c -# End Source File -# Begin Source File - -SOURCE=..\mapopolis.c -# End Source File -# Begin Source File - -SOURCE=..\mapsend.c -# End Source File -# Begin Source File - -SOURCE=..\mapsource.c -# End Source File -# Begin Source File - -SOURCE=..\mkshort.c -# End Source File -# Begin Source File - -SOURCE=..\navicache.c -# End Source File -# Begin Source File - -SOURCE=..\netstumbler.c -# End Source File -# Begin Source File - -SOURCE=..\nmea.c -# End Source File -# Begin Source File - -SOURCE=..\overlay.c -# End Source File -# Begin Source File - -SOURCE=..\ozi.c -# End Source File -# Begin Source File - -SOURCE=..\palmdoc.c -# End Source File -# Begin Source File - -SOURCE=..\pathaway.c -# End Source File -# Begin Source File - -SOURCE=..\pcx.c -# End Source File -# Begin Source File - -SOURCE=..\polygon.c -# End Source File -# Begin Source File - -SOURCE=..\position.c -# End Source File -# Begin Source File - -SOURCE=..\psitrex.c -# End Source File -# Begin Source File - -SOURCE=..\psp.c -# End Source File -# Begin Source File - -SOURCE=..\queue.c -# End Source File -# Begin Source File - -SOURCE=..\quovadis.c -# End Source File -# Begin Source File - -SOURCE=..\reverse_route.c -# End Source File -# Begin Source File - -SOURCE=..\route.c -# End Source File -# Begin Source File - -SOURCE=..\saroute.c -# End Source File -# Begin Source File - -SOURCE=..\shape.c -# End Source File -# Begin Source File - -SOURCE=..\smplrout.c -# End Source File -# Begin Source File - -SOURCE=..\sort.c -# End Source File -# Begin Source File - -SOURCE=..\stackfilter.c -# End Source File -# Begin Source File - -SOURCE=..\tef_xml.c -# End Source File -# Begin Source File - -SOURCE=..\text.c -# End Source File -# Begin Source File - -SOURCE=..\tiger.c -# End Source File -# Begin Source File - -SOURCE=..\tmpro.c -# End Source File -# Begin Source File - -SOURCE=..\tomtom.c -# End Source File -# Begin Source File - -SOURCE=..\tpg.c -# End Source File -# Begin Source File - -SOURCE=..\util.c -# End Source File -# Begin Source File - -SOURCE=..\util_crc.c -# End Source File -# Begin Source File - -SOURCE=..\uuid.c -# End Source File -# Begin Source File - -SOURCE=..\vcf.c -# End Source File -# Begin Source File - -SOURCE=..\vecs.c -# End Source File -# Begin Source File - -SOURCE=..\vitosmt.c -# End Source File -# Begin Source File - -SOURCE=..\vmem.c -# End Source File -# Begin Source File - -SOURCE=..\waypt.c -# End Source File -# Begin Source File - -SOURCE=..\xcsv.c -# End Source File -# Begin Source File - -SOURCE=..\xmlgeneric.c -# End Source File -# Begin Source File - -SOURCE=.\Expat\libexpat.lib -# End Source File -# End Group -# Begin Group "Header Files" - -# PROP Default_Filter "h;hpp;hxx;hm;inl" -# Begin Group "Jeeps-Headers" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\jeeps\gps.h -# End Source File -# Begin Source File - -SOURCE=..\jeeps\gpsapp.h -# End Source File -# Begin Source File - -SOURCE=..\jeeps\gpscom.h -# End Source File -# Begin Source File - -SOURCE=..\jeeps\gpsdatum.h -# End Source File -# Begin Source File - -SOURCE=..\jeeps\gpsfmt.h -# End Source File -# Begin Source File - -SOURCE=..\jeeps\gpsinput.h -# End Source File -# Begin Source File - -SOURCE=..\jeeps\gpsmath.h -# End Source File -# Begin Source File - -SOURCE=..\jeeps\gpsmem.h -# End Source File -# Begin Source File - -SOURCE=..\jeeps\gpsnmea.h -# End Source File -# Begin Source File - -SOURCE=..\jeeps\gpsnmeafmt.h -# End Source File -# Begin Source File - -SOURCE=..\jeeps\gpsnmeaget.h -# End Source File -# Begin Source File - -SOURCE=..\jeeps\gpsport.h -# End Source File -# Begin Source File - -SOURCE=..\jeeps\gpsproj.h -# End Source File -# Begin Source File - -SOURCE=..\jeeps\gpsprot.h -# End Source File -# Begin Source File - -SOURCE=..\jeeps\gpsread.h -# End Source File -# Begin Source File - -SOURCE=..\jeeps\gpsrqst.h -# End Source File -# Begin Source File - -SOURCE=..\jeeps\gpssend.h -# End Source File -# Begin Source File - -SOURCE=..\jeeps\gpsserial.h -# End Source File -# Begin Source File - -SOURCE=..\jeeps\gpsutil.h -# End Source File -# End Group -# Begin Group "ShapeLib-Headers" - -# PROP Default_Filter "" -# Begin Source File - -SOURCE=..\shapelib\shapefil.h -# End Source File -# End Group -# Begin Source File - -SOURCE=..\csv_util.h -# End Source File -# Begin Source File - -SOURCE=..\defs.h -# End Source File -# Begin Source File - -SOURCE=..\garmin_tables.h -# End Source File -# Begin Source File - -SOURCE=..\grtcirc.h -# End Source File -# Begin Source File - -SOURCE=..\holux.h -# End Source File -# Begin Source File - -SOURCE=..\magellan.h -# End Source File -# Begin Source File - -SOURCE=..\mapsend.h -# End Source File -# Begin Source File - -SOURCE=..\queue.h -# End Source File -# Begin Source File - -SOURCE=..\quovadis.h -# End Source File -# Begin Source File - -SOURCE=..\uuid.h -# End Source File -# End Group -# Begin Group "Resource Files" - -# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -# End Group -# End Target -# End Project diff --git a/gpsbabel/msvc/GPSBabel.dsw b/gpsbabel/msvc/GPSBabel.dsw deleted file mode 100644 index 622d699e8..000000000 --- a/gpsbabel/msvc/GPSBabel.dsw +++ /dev/null @@ -1,29 +0,0 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 -# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! - -############################################################################### - -Project: "GPSBabel"=.\GPSBabel.dsp - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/gpsbabel/msvc/GPSBabel.vcxproj b/gpsbabel/msvc/GPSBabel.vcxproj index 1cd0c3fdc..0be8eb349 100644 --- a/gpsbabel/msvc/GPSBabel.vcxproj +++ b/gpsbabel/msvc/GPSBabel.vcxproj @@ -1,3513 +1,379 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + Debug + Win32 + + + Release + Win32 + + + + {588699A5-B1C9-4343-B765-23B4C0837435} + GPSBabel + Application + v110 + false + MultiByte + + + + + + + + + + + <_ProjectFileVersion>11.0.60610.1 + C:\Qt\5.1.0\msvc2012\lib;$(LibraryPath) + C:\Qt\5.1.0\msvc2012\include;$(IncludePath) + .\$(Configuration)\ + .\$(Configuration)\ + false + + + + .\$(Configuration)/GPSBabel.tlb + + + + expat;.;%(AdditionalIncludeDirectories) + Level3 + false + true + ProgramDatabase + Default + Prompt + true + + .\$(Configuration)/GPSBabel.pch + .\$(Configuration)/ + .\$(Configuration)/ + .\$(Configuration)/ + + + 0x0409 + + + setupapi.lib;hid.lib;qt5core.lib;%(AdditionalDependencies) + true + true + Console + false + + MachineX86 + .\$(Configuration)/GPSBabel.exe + .\$(Configuration)/GPSBabel.pdb + + + + + Disabled + EnableFastChecks + MultiThreadedDebug + _CRT_SECURE_NO_DEPRECATE;WIN32;__WIN32__;_DEBUG;_CONSOLE;HAVE_CONFIG_H;%(PreprocessorDefinitions) + true + + + _DEBUG;%(PreprocessorDefinitions) + + + + + Full + OnlyExplicitInline + false + Size + true + _CRT_SECURE_NO_DEPRECATE;WIN32;__WIN32__;NDEBUG;_CONSOLE;HAVE_CONFIG_H;%(PreprocessorDefinitions) + + + NDEBUG;%(PreprocessorDefinitions) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/gpsbabel/msvc/Unicode.empty b/gpsbabel/msvc/Unicode.empty deleted file mode 100644 index e69de29bb..000000000 diff --git a/gpsbabel/msvc/build.bat b/gpsbabel/msvc/build.bat deleted file mode 100644 index 12638a74d..000000000 --- a/gpsbabel/msvc/build.bat +++ /dev/null @@ -1,8 +0,0 @@ -setlocal -set include=%include%;expat;c:\tools\c -set SOURCEJEEPS=..\jeeps\gpsapp.c ..\jeeps\gpscom.c ..\jeeps\gpsmath.c ..\jeeps\gpsmem.c ..\jeeps\gpsprot.c ..\jeeps\gpsread.c ..\jeeps\gpsrqst.c ..\jeeps\gpssend.c ..\jeeps\gpsserial.c ..\jeeps\gpsusbread.c ..\jeeps\gpsusbsend.c ..\jeeps\gpsusbstub.c ..\jeeps\gpsusbwin.c ..\jeeps\gpsutil.c -set SOURCEMAG=..\maggeo.c ..\magnav.c ..\magproto.c -set SOURCE=..\xmltag.c ..\strptime.c ..\trackfilter.c ..\gdb.c ..\bcr.c ..\discard.c ..\formspec.c ..\an1.c ..\arcdist.c ..\brauniger_iq.c ..\wbt-200.c ..\cetus.c ..\coastexp.c ..\copilot.c ..\csv_util.c ..\delgpl.c ..\duplicate.c ..\easygps.c ..\filter_vecs.c ..\garmin.c ..\garmin_tables.c ..\gcdb.c ..\geo.c ..\geoniche.c ..\glogbook.c ..\google.c ..\gpilots.c ..\gpspilot.c ..\gpx.c ..\grtcirc.c ..\hiketech.c ..\holux.c ..\hsa_ndv.c ..\html.c ..\igc.c ..\internal_styles.c ..\kml.c ..\lowranceusr.c ..\main.c ..\mapopolis.c ..\mapsend.c ..\mapsource.c ..\mkshort.c ..\navicache.c ..\netstumbler.c ..\nmea.c ..\overlay.c ..\ozi.c ..\palmdoc.c ..\pathaway.c ..\pcx.c ..\polygon.c ..\position.c ..\psitrex.c ..\psp.c ..\queue.c ..\quovadis.c ..\reverse_route.c ..\route.c ..\saroute.c ..\shape.c ..\shapelib\dbfopen.c ..\shapelib\shpopen.c ..\smplrout.c ..\sort.c ..\stackfilter.c ..\tef_xml.c ..\text.c ..\tiger.c ..\tmpro.c ..\tomtom.c ..\tpg.c ..\util.c ..\util_crc.c ..\uuid.c ..\vcf.c ..\vecs.c ..\vitosmt.c ..\vmem.c ..\waypt.c ..\xcsv.c ..\xmlgeneric.c ..\fatal.c ..\globals.c ..\cet_util.c ..\cet.c ..\nmn5.c ..\nmn4.c ..\cst.c ..\msroute.c ..\stmwpp.c ..\ignrando.c ..\tpo.c -cl /c ..\gpsutil.c -Fogpsutil2.obj -cl /Fegpsbabel.exe %source% %sourcejeeps% %sourcemag% gpsutil2.obj -DVERSION=\"1\" -D__WIN32__ -DWIN32_LEAN_AND_MEAN -DNO_USB Expat\libexpat.lib -endlocal diff --git a/gpsbabel/msvc/mkwintesto.sln b/gpsbabel/msvc/mkwintesto.sln new file mode 100644 index 000000000..7130ec400 --- /dev/null +++ b/gpsbabel/msvc/mkwintesto.sln @@ -0,0 +1,20 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Express 2012 for Windows Desktop +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mkwintesto", "mkwintesto.vcxproj", "{7B3D3B02-91E7-4978-A783-007CBACFAA6D}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {7B3D3B02-91E7-4978-A783-007CBACFAA6D}.Debug|Win32.ActiveCfg = Debug|Win32 + {7B3D3B02-91E7-4978-A783-007CBACFAA6D}.Debug|Win32.Build.0 = Debug|Win32 + {7B3D3B02-91E7-4978-A783-007CBACFAA6D}.Release|Win32.ActiveCfg = Release|Win32 + {7B3D3B02-91E7-4978-A783-007CBACFAA6D}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/gpsbabel/msvc/mkwintesto.vcxproj b/gpsbabel/msvc/mkwintesto.vcxproj new file mode 100644 index 000000000..f460a6979 --- /dev/null +++ b/gpsbabel/msvc/mkwintesto.vcxproj @@ -0,0 +1,122 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Template + Win32 + + + + + + {7B3D3B02-91E7-4978-A783-007CBACFAA6D} + + + + Application + v110 + false + MultiByte + + + + + + + + + + <_ProjectFileVersion>11.0.60610.1 + .\$(Configuration)\ + .\$(Configuration)\ + + + true + + + false + + + + MultiThreadedDebug + Default + false + Disabled + true + Level3 + true + EditAndContinue + _CRT_SECURE_NO_DEPRECATE;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + .\Debug\ + .\Debug\mkwintesto.pch + .\Debug\ + .\Debug\ + EnableFastChecks + + + .\Debug\mkwintesto.tlb + + + 0x1009 + _DEBUG;%(PreprocessorDefinitions) + + + true + .\Debug\mkwintesto.bsc + + + true + true + Console + .\Debug\mkwintesto.exe + %(AdditionalDependencies) + + + + + MultiThreaded + Default + true + true + MaxSpeed + true + Level3 + _CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + .\Release\ + .\Release\mkwintesto.pch + .\Release\ + .\Release\ + + + .\Release\mkwintesto.tlb + + + 0x1009 + NDEBUG;%(PreprocessorDefinitions) + + + true + .\Release\mkwintesto.bsc + + + true + Console + .\Release\mkwintesto.exe + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + + + + + + + + \ No newline at end of file diff --git a/gpsbabel/msvc/release.empty b/gpsbabel/msvc/release.empty deleted file mode 100644 index e69de29bb..000000000 -- 2.30.2